From 261d19559d62f7b4b868275d54fa74315be9a42a Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Fri, 23 Apr 2010 08:37:19 +0100 Subject: [PATCH] Revert 21224:a7947fd90328 "xend: earlier remove the backend of tapdisk device" Consensus is that this is not the correct fix. Signed-off-by: Keir Fraser --- tools/python/xen/xend/XendDomainInfo.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index b8f7296a30..dcf26a9886 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -2408,13 +2408,8 @@ class XendDomainInfo: def _releaseDevices(self, suspend = False): """Release all domain's devices. Nothrow guarantee.""" - t = xstransact("%s/device" % self.vmpath) if self.image: try: - for dev in t.list('tap'): - log.debug("Early removing %s", dev); - self.getDeviceController('tap').destroyDevice(dev, True) - time.sleep(0.1) log.debug("Destroying device model") self.image.destroyDeviceModel() except Exception, e: @@ -2423,10 +2418,9 @@ class XendDomainInfo: log.debug("No device model") log.debug("Releasing devices") + t = xstransact("%s/device" % self.vmpath) try: for devclass in XendDevices.valid_devices(): - if devclass is 'tap': - continue for dev in t.list(devclass): try: log.debug("Removing %s", dev); -- 2.30.2